~ Better file structure