changed some file structure