restructured project to get rid of unnecessary folders