Reorganized to Maven dir layout for SBT