Cleaned up directory structure.
Allowed for the addition of multiple archetectures in the future.