refactor project structure.Split into 2 packages.Cleaned up directories.