Fixed build settings and source folders