Restructure of code, delete useless shit