re-arrange source files