Restructure

Please do the following pull request.