- Renamed files and seperated into three files