change structure
move files into application