Reorganised folders & fixed compilation errors