Finished Properties and file organisation

I'll add documentation and stuff so it makes sense soon.