The layout is super bad. wanted to fix the file structure which is now in place. Next step is to make it look nice