Organization

Organized files and classes