remove unused code
move files into sensible dirs