Code updates, move and rename

Finished code for the data class. <br> 
Moved it to a new folder and renamed it.