Rearranged folder structure to comply with standards on java and scala directories