Cleaning up

moving everything into proper files for better organization