Finished basic structure

Had some problems here, because of multiple storage places. Fixed the
fact that i had commits on different pc's. Still open.