packages renamed;
style support added;
minor code cleaning