code refactoring

- moved to Kiryatti's directory structure
- different pyramid