Rebuild the project structure

I made it work in Glassfish 4. More containers hopefully coming soon