Fixed compilation errors. Directory structure corrected