Changed folder organization mostly

Renamed folders, added some folders, changed project to be jdk 1.6