Renamed info file
Rename functions and add folder structure.