Actually added the files this time (for basic architecture first draft)