major refactor of files structure