Moved files around to simplify
Include more things in manifest

Not exactly sure if this is needed.