I know how you feel, it's so easy to postpone proper organization indefinitely. What's funny is that I've spent a great deal of effort making sure that the actual code is logical and well thought though, it's literally just the directory structure that's disorganized.