Cleaned up scaffold code
Modified project structure to be a nice library