added main class and moved some folders around