feat: add new files, major code addons and minor refactors