Deleted cruft

Added new project structure