Rearranged directory structure, converted to maven project