#452 Separated source files from build files more clearly