moved files around for better directory structure
updated paths