Restructuring code
Moved files around