Restructure Sourcecode