added everything to seperate folders