Reorganization and removal

Using gitignore now, hopefully it works