update file structure, add router logic, change views