Singleton Pattern

- Added static initialisation singleton
- Folder name changes