Changes made to the project hierarchy and packages renamed