Re-organized source files, to match java project conventions