Fix issue #270 - Restructure code to use maven directory layout