- Moving to proper structure for Composer
- Rename namespace for Composer convention