Finalized directory structure, removed arbitrary directory separation.