Moving prototyping code into proper file names and location