Made stuff betterererer

Everything is in main folder now, created new file for analysis.