Organised files in app directory, added cucumber tests