reorganizing the dir and starting to fix things