fix issues and files structure, starting commit