removed redundant libs, changed layout