Organized some classes and features
Added some files