Restructed folders to be more inline with java package symantics.