Moved things to libraries
More front end and back end modifications