fixed package layout and added proxy!