Moved directory locations
Added extra sensors