Moved source to ensure recognization by eclipse
Updated imports for new packages