File organisation, layouts, test, tasks. Everything mostly working now
Updated README