Refactored dir structure and some updates