Fixed compile errors
Organized files