reworked file structure, begain router spec