UNO: Moved the project to the netbeans way of doing things. I liked my structure better but hopefully I can learn more this way and move it back to my way later.