A few changes, re-organized directories + files