Restructuring

Changed structure, adapted layout from singularity.gs