Cleaning up the code

Organization...