Restructured project

Since there was no need for an extra folder to be there.