cleaned up folder structure

moved stuff -> src