Moved project distribution and reorganized readme
Restructured project
Pull in changes
Solve merge artifacts