Cleaned up the repo *a bit*. Still could be cleaner