simplified the directory structure and removed the cyberaide directory, where this came from