Refactor and documentation
Renamed some files