Removed mysterious trailing dash from project name, flattened folder hierarchy