Moved to directory structure that mirrors src