Moving files
First compiling version of data lib
Refactoring completed