Started main, restructured directory structure