- Updated directory architecture
- Updated sources and makefiles for new architecture