Changed pakage structure