Added packages and files structure