Make it simple

delete layout folder
delete base folder

move base stuff into partials folder
move form into moduls folder