Moved source code into proper places