Header renaming and restructuring + some fixes here and there