moved directory structure around to use maven and intellij