extended configuration. fixed bugs
added basic sources skeleton