Reorganized directory structure to make it closer to common practices.