Cleaning

Cleaned up some comments and moved files around