Updataing, reorganizing and writing code

Basically, catching up after several weeks of inactivity