Reverted 'Moved Controller, Entity and Form folders'. Reverted white space changes.