Restructured package, added targets