Organized functions into multiple files. Simple cleanup commit