changed routing and cleaned up files