Initial commit removing old files and rearranging