Added namespacing, simplified folder structure