Moved module src folders into main folder
Started updating for 1.7.10