Different bugfixes + libraries structure rebuilt