Restructured project directories
Fixed import-related compilation issues