Fix issue with keyboard nav not working, restructure repository