Moved source files into seperate directory