@3oheme refactoring files a bit